Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Fri, 8 Jul 2011 20:22:17 +0000 (13:22 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Fri, 8 Jul 2011 20:22:17 +0000 (13:22 -0700)
commit5be6053b914ab3894526011cf4da9b56aa404e71
tree3c7843b4582b69b8adac0f07d3f9b5325425807b
parentb31fc9a0beb4db5f8bae1ea240958b7e7c0e8437
parentd0e9258fa0ad0d957674852bb3a16032fe77d32b
Merge from trunk.
ChangeLog
src/ChangeLog